Properly declare ioapic_update_EOI().

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/vmx_vlapic.c b/xen/arch/x86/vmx_vlapic.c
index 96c8f9c56c0ad5e7b491641e4f96aae4ae13e2c8..fa1dc2118db44f170557b502231ecc03998b351f 100644 (file)
--- a/xen/arch/x86/vmx_vlapic.c
+++ b/xen/arch/x86/vmx_vlapic.c
@@ -28,7 +28,7 @@
 #include <asm/vmx.h>
 #include <asm/vmx_platform.h>
 #include <asm/vmx_vlapic.h>
-
+#include <asm/vmx_vioapic.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
 #include <asm/current.h>
@@ -322,10 +322,8 @@ vlapic_EOI_set(struct vlapic *vlapic)
     vlapic_clear_isr(vlapic, vector);
     vlapic_update_ppr(vlapic);
 
-    if (test_and_clear_bit(vector, &vlapic->tmr[0])) {
-        extern void ioapic_update_EOI(struct domain *d, int vector);
+    if (test_and_clear_bit(vector, &vlapic->tmr[0]))
         ioapic_update_EOI(vlapic->domain, vector);
-    }
 }
 
 int vlapic_check_vector(struct vlapic *vlapic,

diff --git a/xen/include/asm-x86/vmx_vioapic.h b/xen/include/asm-x86/vmx_vioapic.h
index 766d70048b71fc6c8389fadceab5667e4fe55082..925bcef68bccbb16a4d54c8944577af69a1eb096 100644 (file)
--- a/xen/include/asm-x86/vmx_vioapic.h
+++ b/xen/include/asm-x86/vmx_vioapic.h
@@ -114,6 +114,8 @@ void vmx_vioapic_set_irq(struct domain *d, int irq, int level);
 
 int vmx_vioapic_add_lapic(struct vlapic *vlapic, struct vcpu *v);
 
+void ioapic_update_EOI(struct domain *d, int vector);
+
 #ifdef VMX_DOMAIN_SAVE_RESTORE
 void ioapic_save(QEMUFile* f, void* opaque);
 int ioapic_load(QEMUFile* f, void* opaque, int version_id);